Merge from gnulib.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 May 2011 21:21:13 +0000 (14:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 May 2011 21:21:13 +0000 (14:21 -0700)

Trivial merge